From 232414f371cda675ac1d3352327e744df96299db Mon Sep 17 00:00:00 2001 From: Michael Natterer Date: Fri, 7 Jul 2006 15:54:06 +0000 Subject: [PATCH] gtk/gtkrc.c fix canonicalization of property names which was broken after 2006-07-07 Michael Natterer * gtk/gtkrc.c * gtk/gtksettings.c: fix canonicalization of property names which was broken after recent constant string cleanup. --- ChangeLog | 6 ++++++ ChangeLog.pre-2-10 | 6 ++++++ gtk/gtkrc.c | 4 ++-- gtk/gtksettings.c | 2 +- 4 files changed, 15 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6849f92915..6a0048f520 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2006-07-07 Michael Natterer + + * gtk/gtkrc.c + * gtk/gtksettings.c: fix canonicalization of property names which + was broken after recent constant string cleanup. + 2006-07-07 Matthias Clasen * gtk/gtkicontheme.c: Small memory savings. diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 6849f92915..6a0048f520 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,9 @@ +2006-07-07 Michael Natterer + + * gtk/gtkrc.c + * gtk/gtksettings.c: fix canonicalization of property names which + was broken after recent constant string cleanup. + 2006-07-07 Matthias Clasen * gtk/gtkicontheme.c: Small memory savings. diff --git a/gtk/gtkrc.c b/gtk/gtkrc.c index b7102f095f..b275e64f8f 100644 --- a/gtk/gtkrc.c +++ b/gtk/gtkrc.c @@ -2679,7 +2679,7 @@ gtk_rc_parse_statement (GtkRcContext *context, svalue.origin = prop.origin; memcpy (&svalue.value, &prop.value, sizeof (prop.value)); - g_strcanon (name, G_CSET_DIGITS "-_" G_CSET_a_2_z G_CSET_A_2_Z, '-'); + g_strcanon (name, G_CSET_DIGITS "-" G_CSET_a_2_z G_CSET_A_2_Z, '-'); _gtk_settings_set_property_value_from_rc (context->settings, name, &svalue); @@ -2921,7 +2921,7 @@ gtk_rc_parse_style (GtkRcContext *context, /* it's important that we do the same canonification as GParamSpecPool here */ name = g_strdup (scanner->value.v_identifier); - g_strcanon (name, G_CSET_DIGITS "-_" G_CSET_a_2_z G_CSET_A_2_Z, '-'); + g_strcanon (name, G_CSET_DIGITS "-" G_CSET_a_2_z G_CSET_A_2_Z, '-'); prop.property_name = g_quark_from_string (name); g_free (name); diff --git a/gtk/gtksettings.c b/gtk/gtksettings.c index 8f1606583c..2b038f9c20 100644 --- a/gtk/gtksettings.c +++ b/gtk/gtksettings.c @@ -971,7 +971,7 @@ gtk_settings_set_property_value_internal (GtkSettings *settings, } name = g_strdup (prop_name); - g_strcanon (name, G_CSET_DIGITS "-_" G_CSET_a_2_z G_CSET_A_2_Z, '-'); + g_strcanon (name, G_CSET_DIGITS "-" G_CSET_a_2_z G_CSET_A_2_Z, '-'); name_quark = g_quark_from_string (name); g_free (name); -- 2.30.2